Merge pull request #2 from narrowspark/master

update
Merge pull request #29 from prisis/develop

Merge pull request #2 from narrowspark/develop