#51 & #50 Fix. The reading of annotations was improved.