Push to review
Merge pull request #7 from fox-squirrels-2013/Code_Review

Code review