closes #68 and #63