fix issue #252
Merge branch 'master' into refactor-transformer