Fix option handling
Merge branch 'master' of github.com:clbarnes/human_event_detection