#34. Support for 'master' option, including tests