respect listener mode
Merge branch 'master' of github.com:BordenJardine/mhd2014