Adding type to  when necessary
Extract for links with type
Merge branch 'master' into links_with_type
Merge pull request #50 from Asgaroth/links_with_type

Adding type to links when necessary
Hyphenate file names