Added stop to shoot functionality
Merge branch 'master' into Issue89
Merge master changes