modified:   AUTHORS
Merge pull request #12 from ywahl/master

modified:   AUTHORS