Merge GPlugin branch

I have been using this code for few weeks now so it is at least as stable as default