Merge pull request #134 from californiavol/master

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

Merge pull request #134 from californiavol/master