Merge pull request #19 from californiavol/master

merge from master
Merge pull request #20 from californiavol/macbook-branch

Merge pull request #19 from californiavol/master