Added passive mode
Merge branch 'colinhumber-master' into develop