Merge pull request #64 from californiavol/master

merge from master