Merge pull request #56 from californiavol/master

merge master into macbook-branch