Merge pull request #139 from californiavol/master

Merge from master