Merge pull request #28 from californiavol/macbook-branch

Macbook branch
Merge branch 'master' into macbook-branch