fixed #1 - making states on button
Merge remote-tracking branch 'origin/master'