*Resolve #2: Merge branch 'feature/buttons' into develop