Merge pull request #62 from nolanfilter/Nolan

Added clipping detection and prevention