Fixes #48

Waiting on #49 to merge