ddunker/calc — pull request #17 by ddunker (2014-10-29 13:06:42+00:00)
Title: Merge pull request #14 from ddunker/master

merge