Fixes closes #88 and closes #87