made mo's changes
Merge branch 'master' into dan
Update
Merge pull request #9 from fox-squirrels-2013/dan

Dan