refact main
Merge pull request #8 from ataro24/develop

refact main