Merge pull request #93 from californiavol/master

merge from master