fixes #35
conflict resolved2