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