Merge pull request #56 from californiavol/master

merge master into macbook-branch
Merge pull request #58 from californiavol/macbook-branch

Merge pull request #56 from californiavol/master