Merge pull request #15 from californiavol/master

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

Merge pull request #15 from californiavol/master