Partially addresses #192