Bugfix, amount need not to be defined beforehand
Bugfix in udf dictionary, no numeric udf:s could be added
Another try on avoiding key error when user has deleted udf
Merge branch 'amount'