#143 fixed endpoints occuring multiple times in endpoint selection
Merge branch 'master' into dev