typo, todo
Merge branch 'master' of github.com:tillmo/DOL
fixed #48. As discussed in telecon, 'end' is generally not optional