Add support for editor/author closes #7
Minor bug fixes