Merge pull request #12 from californiavol/master

merge master into macbook-branch