added flexible extensions
merge conflicts resolved
calc: integer implementation