Fix for issue #15 and other wrong link