Merge pull request #74 from californiavol/master

merge from master
Merge pull request #77 from californiavol/macbook-branch

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

Merge pull request #74 from californiavol/master
Merge pull request #79 from californiavol/master

merge from master