Merge pull request #1 from pnegahdar/develop

Develop
Merge branch 'master' of github.com:pnegahdar/billy into develop