implemented not implemented methods
Added override tag
Merge branch 'bugfix-tsp' into develop