fixes #48, fixes #49
Merge branch 'master' of https://github.com/splangi/automaatnehindaja.git