fixes #109 check if correct data arrives, else return
Merge branch 'development_marc' into development