Merge pull request #18 from ddunker/master

Merge pull request #17 from ddunker/br