Work on elaboration, and some clean-up
Merge branch 'master' of github.com:nguyentito/mlpp