Added a README and license.
Minor fixes. Removed unused options.
Merge branch 'develop'