Merge pull request #42 from californiavol/master

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

Merge pull request #42 from californiavol/master