Merge pull request #74 from californiavol/master

merge from master