Merge remote-tracking branch 'origin/pr/21'
Merge branch 'master' of https://github.com/Zedzap/WackaUML