added CONTRIBUTORS.txt and CONTRIBUTING.txt
event construction: bugfix
Merge remote-tracking branch 'upstream/master'
Adding myself to contributors