Manual merge of pull request 22

Adding link, file and folder type support. Contributed by @jsieber