Mostly fixes #123
Awesome, thanks for submitting this, @bex. Merging! :clapper:
Pull-Request has been merged by jflory7
Mostly fixes #123