closed #3
Merge branch 'feature/3-dist-folder' into dev