Made some small fixes based on testing phase.
Merge branch 'master' of https://github.com/JKayse/Caterva