my rebase added too many links, but they are fixed now
Merge pull request #276 from Tmee/fix_failing_tests

my rebase added too many links, but they are fixed now