closes #115 and closes #102