Made the program more interesting before production!
Merge branch 'release/1.0' into develop