committing changes before merging with master.
Contour implementation update