Merge pull request #3 from digiovan/master

Conservative Limits Code Merge from digiovan