Merge pull request #12 from noproblan/develop

Merge branch 'refs/heads/develop' into master
Merge pull request #15 from noproblan/master

Merge pull request #12 from noproblan/develop