Refactor @cmlh 2013 Presentation
Fix #2