Merge pull request #11 from capcarr/master

Day 0 review