Added more documentation, fixed a minor bug on merge, annotations were not merged before