Merge pull request #25 from ddunker/br

Merge pull request #24 from ddunker/master
fix
refactor
1.11
Merge pull request #26 from ddunker/master

1,11