Merge pull request #109 from californiavol/master

merge from master