Merge pull request #192 from clacote/master

All previous (not-merged) PRs in a new big-fat-one
Merge pull request #193 from clacote/master

Some useless stuff. Or not. But that's badass.
Merge branch 'master' of git://github.com/cexbrayat/linkit