Merge pull request #84 from californiavol/master

merge master into macbook-branch