Merge pull request #70 from californiavol/master

merge from master