Fixed bug and added option no-annotations