fixes #70, fixes #71
Merge branch 'master' of https://github.com/karl963/BizInt.git