Merge pull request #141 from californiavol/master

Merge from master