Merge pull request #339 from jschneier/master

fix decorator/test case, update CHANGES and add to CONTRIBUTORS
Removing minor bug fix from changes.