Merge pull request #2 from narrowspark/develop

update