Presenter support

PR for #35