Fixed Stoyan's errors
Merge branch 'master' of github.com:stoyanoff/newp