Evil name clash avoidance
Merge branch 'master' of github.com:nguyentito/mlpp