Merge branch 'strider29-master'

Signed-off-by: astonex <softukitu@gmail.com>
Merge branch 'master' of https://github.com/Astonex/Antox