Made more user friendly
Merge branch 'optimize'
bugfix