another try to fix issue#132
Merge remote-tracking branch 'pull/172/head' into devel