Closes #238, closes #239