Merge pull request #151 from californiavol/master

Merge from master