Merge pull request #143 from californiavol/master

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

Merge pull request #143 from californiavol/master