bugfixes
Merge branch 'master' of github.com:cmantas/tiramola_v3
merged fixes