Few changes for security
Merge branch 'master' of https://github.com/teameax/tictaceax