Please merge from upstream

Hello. I've updated this project to take incorporate most of the things forks like this have done, so the upstream project should now have all of this done already. Could you consider merging the upstream into your version now? This way we all have one canonical version to work on?