Fixes Issue #3

Not tested yet, so it shouldn’t be closed.