Import modifications to master branch

Can you grant me push permission on this repository?

And please feel free to provide any comments you may have.