After review
Merge branch 'master' of https://github.com/Tr1ckX/Takeaway