version beta
Merge branch 'feature/selectable' into develop