Fixes #219

Figured pull-requests out! :smile: