Merge pull request #139 from californiavol/master

Merge from master
Merge pull request #140 from californiavol/imac-work

Merge pull request #139 from californiavol/master