Merge pull request #121 from californiavol/master

Merge from master