Update #31

Update #30

Update #28

Dic/05/16