Merge pull request #2 from Niko113355/feature

Feature