Merge pull request #105 from californiavol/master

merge from master