Merge pull request #102 from californiavol/master

merge from master