Merge pull request #9 from californiavol/master

Merge master into imac-work