changes from Kovid
Merge branch 'master' of github.com:t3d/kalibrator