Merge pull request #618 from leider/master

wiki changes now with authors