Merge request

Hi,
I just wanted to merge my forked repo with your recent commits
Cheers,
M.