Merge pull request #123 from californiavol/master

Merge from master