Merge pull request #47 from californiavol/master

merge master into imac-work