Merge pull request #21 from ddunker/master

merge