Some more stuff
Merge pull request #1 from Nimphina/Patch-1

Some more stuff