squashed bugs
Merge pull request #25 from cameronklein/Cam

squashed bugs