First new version 1.0 commit
(based on old code)
Merge origin/master