Merge pull request #69 from californiavol/master

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

Merge pull request #69 from californiavol/master