Merge pull request #12 from davidw/stop_child_fix

Fix for broken stop_child
Merge branch 'master' into application_stop_fix