Merge pull request #26 from ddunker/master

1,11
Merge pull request #27 from ddunker/br

Merge pull request #26 from ddunker/master