Changed buttonlistener to switchlistener
Merge branch 'master' of github.com:Dowers/tsea29