Merge pull request #105 from californiavol/master

merge from master
Merge pull request #107 from californiavol/imac-work

Imac work
Merge pull request #108 from californiavol/macbook-branch

Merge pull request #105 from californiavol/master
Merge pull request #109 from californiavol/master

merge from master