User options

closes #60 and #58