arcons suggestion
Merge pull request #732 from sebyg666/4.1-dev

arcons suggestion