a few modifications/fixes
Merge branch 'master' of https://github.com/seshbot/glpp