Possible fix for #168, @mkohlhase please check
Merge branch 'master' into dev