locking down cannon on pause
Merge pull request #62 from wroy/master

locking down cannon on pause