Clean up, bug fix
P was not being handled properly
Merge branch 'master' of github.com:asterick/tamago