Merge pull request #22 from ddunker/br

Merge pull request #21 from ddunker/master
refactoring
Merge pull request #24 from ddunker/master

refactoring