add annot to Makefile and fixed issue with '-'
Merge commit 'f112ca3d3a374c657191c89f2c1ec545afc3f8f3'