Fix link in references
Combines the changes of @mlablans 's pull requests #41, #43 and #44 in order to avoid spamming master with merge commits.
Combines the changes of @mlablans 's pull requests #41, #43 and #44 in order to avoid spamming master with merge commits.