Merge pull request #126 from californiavol/master

Merge from master
Merge pull request #131 from californiavol/master

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

Macbook branch