GH246 - sync from diagram

issue #246