Merge pull request #74 from californiavol/master

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

Merge pull request #74 from californiavol/master