Merge pull request #69 from californiavol/master

merge from master