Fixes that need to be parametrized
Enhancements finished.
Merge pull request #3 from cesarnicola/master

Configuration and overall enhancements