Merge pull request #15 from californiavol/master

merging master into imac-work