Merge pull request #1 from ddunker/master

ti