Merge pull request #12 from californiavol/master

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

Merge pull request #12 from californiavol/master