Task #151: Button add events
Merge branch '151' into dev