Bugfix: Nullpointer
Merge branch 'develop' of https://github.com/Jather90/AMOS_proj5 into develop