Merge pull request #109 from californiavol/master

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

Merge pull request #109 from californiavol/master