Feature/improve compatibility

@rjocoleman
I've tested and it's working great. I will add you to the contribution list.