New dev version
Fixes defaultButton assignment
Merge branch 'dev'