Merge pull request #92 from californiavol/master

Merge master into imac-work