Merge pull request #21 from tejonbiker/master