Merge pull request #84 from californiavol/master

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

Merge pull request #84 from californiavol/master