Merge branch 'develop' into configure
Update configure script
Merge branch 'configure' into develop
Update README and output of --help option
Merge branch 'develop'
Update README