Add logging
Merge branch 'planex-clone' into matemaster