Note to self: instanceof is a thing
Some more tries at fixes
Merge pull request #29 from iconmaster5326/master

Some stuff