Fix for Issue #12: Not properly removing handlers before re-adding them ...

Here's the same pull request again, this time on develop!

Thanks,
Evan