Init commit
Merge branch 'master' of https://github.com/ganddev/IS
Changes in main methode