Merge pull request #47 from californiavol/master

merge master into imac-work
Merge pull request #49 from californiavol/macbook-branch

Macbook branch
Merge pull request #50 from californiavol/imac-work

Merge pull request #47 from californiavol/master
Merge pull request #52 from californiavol/master

merged macbook with master