Add to do list
Fix line breaks
Let user set parameters
Merge branch 'master' into gh-pages