Clean codebase
Merge pull request #56 from toopay/develop

Clean codebase