fix issue #42
merge dev