Merge pull request #98 from californiavol/master

merge from master