Additional changes in the configuration and minor fixes.
Merge pull request #53 from jmnarloch/final-fixes

Additional changes in the configuration and minor fixes.