Fixing Tickets #4
Stop button is now working as expected
Authored by: cumanzor 2012-06-03
Parent: [r9]
Child: [r11]
