Added user check
Merge branch 'development' of github.com:loopdk/loop_search into development