Created by: s-mm
This PR combines PR 101 and PR 102. The code has been tested by the annotators and approved.