Refactored
updated version
Merge pull request #4 from finapps/develop

Develop