Merge pull request #99 from californiavol/master

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

Merge pull request #99 from californiavol/master