Added annotation mechanism. Closes #43.