bug fixes
bug fixes
bug fixes
Merge pull request #57 from prisis/refactor

Refactor
Merge pull request #11 from narrowspark/develop

Develop