Merge branch 'master' of https://github.com/webpresence/typocalc into kriss2