ENd of the day commit by romaan
Merge branch 'master' of https://github.com/Rarzarol/PaPEr