Updategin 1
Merge branch 'master' of https://github.com/Gray0Ed/FiJaSy
Update 2