From Veni
Merge branch 'master' of https://github.com/stoyanoff/newp
Merge branch 'master' of https://github.com/stoyanoff/newp