Merge pull request #30 from californiavol/macbook-branch

Macbook branch