Added an option to use a master key (Closes #3)