Merge pull request #24 from californiavol/master

merge master into imac-work