fix a few bugs
Merge branch 'master' of github.com:weijen/gurupu