Merge pull request #99 from californiavol/master

merge from master