more end points
Merge branch 'develop' into feature/end_points