Merge pull request #9 from narrowspark/develop

Develop
some changes
cs fixes
Merge pull request #54 from prisis/develop

refactor