Merging in jcoleman's changes, adding a  option