Bugfix
Merge branch 'sim_card' into develop