Merge branch 'feature/#10_button' into develop