closes LucaFilipozzi/secure-link#2