Scripts and files for the conservative merging. Never approved, but
still requested by the ARC
Merge pull request #3 from digiovan/master

Conservative Limits Code Merge from digiovan