Fixed all of the things
Merge pull request #13 from fox-squirrels-2013/Marc_Daniel

Fixed all of the things