Semi working version
Merge branch 'master' of github.com:stoyanoff/newp