minor changes to a few files
Merge branch 'master' of http://github.com/peteramckay/beams