Merge pull request #2 from new-neon/master

Update