Merge pull request #24 from ddunker/master

refactoring
Merge pull request #25 from ddunker/br

Merge pull request #24 from ddunker/master