Merge branch 'master' into macbook-branch
Merge pull request #159 from californiavol/macbook-branch

Merge branch 'master' into macbook-branch