closes #17 and #18