Merge pull request #98 from californiavol/master

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

Merge pull request #98 from californiavol/master