added basic version for comparison
corrected error
Merge branch 'dev' into dev-non-uni-5-users