Fix #8 and #6
Merge branch 'master' of https://github.com/knjeurope/Cbatos-Theliav2