tasks 1 & 2
Merge branch 'master' of https://github.com/astraris/enadyotria