Fixes #36

Thanks NeoPhoenix