fix minor bugs
Merge branch 'master' of github.com:ivankristianto/calibrefx-toolkit