Merge pull request #85 from oleg-agapov/fix-links-and-add-new