Some additions

[erikbergsma]

When testing and using your (very cool!) code and tools i ran into some corner cases which i fixed. Hopefully these are useful for you / the OSS community as well! (see the individual commits for the details on what was changed)