Working on Holbert
merged with master
Merge branch 'master' of github.com:fredstro/psage
Fixed bugs