Merge branch 'master' of https://github.com/BenMQ/laughing-avenger
Merge branch 'master' of https://github.com/BenMQ/laughing-avenger