Added endpoint option
Merge branch 'feature/endooint_option' into develop