fix
fix
fix
Base checking done.
Extract utils.
fix
fix
Done
Merge branch 'iss50' into iss47