Merge pull request #17 from noproblan/master

Merge pull request #16 from noproblan/develop
Merge pull request #18 from noproblan/develop

Merge pull request #17 from noproblan/master