Some updates
Merge branch 'master' of https://github.com/t1m0/AlertServer.git