closes #68, closes #69