Merge pull request #52 from californiavol/master

merged macbook with master
Merge pull request #54 from californiavol/macbook-branch

Merge pull request #52 from californiavol/master