Merge pull request #18 from ddunker/master

Merge pull request #17 from ddunker/br
Merge pull request #20 from ddunker/master

issues #16 #6
Merge pull request #19 from ddunker/br

Merge pull request #18 from ddunker/master