MOB-164 buttonpress bug, now using add and remove instead of toggle
Merge pull request #104 from Maryami/MOB-164

MOB-164 buttonpress bug, now using add and remove instead of toggle