Merge pull request #10 from ddunker/br

Merge pull request #7 from ddunker/master
issue #9
Merge https://github.com/ddunker/calc
Merge pull request #12 from ddunker/master

issue #9