pre-refactor
Merge branch 'develop' of https://github.com/Sourcely/sourcely into develop
Merge pull request #9 from Zhang/develop

Develop