Merge pull request #117 from californiavol/master

Merge from master