Merge with new master

Hi, the module you forked is updated with some fixes. Can you merge it?