Merge pull request #70 from californiavol/master

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

Merge pull request #70 from californiavol/master