Merge pull request #134 from fsb4000/options