Merge pull request #35 from californiavol/master

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

Merge pull request #35 from californiavol/master