Merge pull request #29 from Pita/develop

Develop
Merge pull request #31 from Pita/develop

Develop
Merge pull request #32 from Pita/develop

Update package.json
bump v
Merge pull request #34 from Pita/master

update develop with master