Enh/4/node annotation

fixes #4