Merge branch 'master' of https://secure.softndesign.org/git/calc