update CHANGES for Issue #320
add myself to contributors
fix decorator and corresponding test case
Merge pull request #339 from jschneier/master

fix decorator/test case, update CHANGES and add to CONTRIBUTORS