added to gcorradini branch
Merge branch 'master' into gcorradini
Removed beginning and end for dev purposed