Merge pull request #2 from celsius/master

story: fix link for author
various bugfixes