Contribution with bugfixing

[tomdhoore-houseofhr]

@jeshuaedgar , are you open to add other contributors to your project? I see there's not much activity anymore, and I'm happy to help adding features & bugfixes