Merge branch 'hotfix/0.2.3'
Fix missing Log4j:: error
Merge branch 'hotfix/0.2.4' into dev