Start to make changes for avoiding conjunction loop, but don't yet activate them.
Fix option test - there shouldn't be a hyphen in the key
Minor javadoc cleanup, and make instance variables private.
Make a method static
Add a tood
Merge remote-tracking branch 'origin/master'