Update 1.1 by Niko
Merge branch 'master' of https://github.com/Kambocha/Ziko