minor changes
Merge branch 'master' of github.com:benjamw/fun_o_rama