Merge pull request #134 from californiavol/master

merge from master