Merge pull request #32 from californiavol/master

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

Merge pull request #32 from californiavol/master