Merge pull request #24 from californiavol/master

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

Merge pull request #24 from californiavol/master