Merge pull request #516 from m-a-x-s-e-e-l-i-g/master

Merge pull request #516 from m-a-x-s-e-e-l-i-g/master #846