Provides enhancement from issue #13.

I think this covers the changes to the preference scheme discussed in #13.