Tweaks
Merge branch 'master' into feature/simon
Integration of Ruis work
Inclusion of old stops function
Merge pull request #9 from cts12/feature/simon

 Feature/simon