Merge pull request #121 from californiavol/master

Merge from master
Merge pull request #124 from californiavol/macbook-branch

Macbook branch
Merge pull request #125 from californiavol/imac-work

Merge pull request #121 from californiavol/master
Merge pull request #126 from californiavol/master

Merge from master