Modify main class use constructor to init object and instanciate classes
Merge branch 'hotfix/1.0.1'