Improved domain
Merge branch 'master' of https://github.com/hoihallohoi/PAF2