Merge pull request #19 from californiavol/master

merge from master