previous change got reverted somehow by niel's commit
Merge pull request #1157 from Bart39/dev

previous change got reverted somehow by niel's commit