Mateotey

These fixes are much appreciated -- thank you! Please merge

We love this library -- can someone take over write access or approve prs?

this would be really great if someone could code this pr