turn constants into functions
add time function
@+ and @*
bump version number
Merge branch 'module/calc' into dev