Merge pull request #117 from californiavol/master

Merge from master
Merge pull request #119 from californiavol/macbook-branch

Merge pull request #117 from californiavol/master