Merge pull request #143 from californiavol/master

Merge from master