Fixing comment
Implementing new, better solution
don\'t drink and code
Better solution
Cleanup
Better drawing
Merge branch 'master' into gh-pages