Merge pull request #19 from iassic/master

master ahead of develop
Merge pull request #20 from iassic/develop

Merge pull request #19 from iassic/master