closes #17 and #15