minor additions
Merge branch 'master' of github.com:jcandy/jaam