closes #181, closes #182