Merge pull request #22 from blackshirt/master