Merge pull request #14 from ddunker/master

merge