PSR1-2
update version
Close #94
Close #88
Merge pull request #3 from 2amigos/master

Update from origin