merge
Merge branch 'linker_dev' of https://github.com/b0noI/linkshorter into linker_dev
fix issue #26