Merge pull request #17 from christoph2005/chris-branch

Chris branch: Clipping bug fix, code cleanup and latest credits