Initial commit
Merge branch 'master' into feature
Imported to IntelliJ and fixed crash