crysxd Merge pull request #2 from TobiPristupin/master