Fix pull request from fork

This should fix #50 once and for all :hammer: