Closes #182, possibly #179