Merge bmilesp fork

Was looking at the fork graph and noticed @bmilesp has quite a bit of work on this plugin.

Perhaps we should merge this in and he would be interested in joining the contributors?