Merge pull request #92 from californiavol/master

Merge master into imac-work
Merge pull request #94 from californiavol/imac-work

Merge pull request #92 from californiavol/master