closes #36 and #37