Merge pull request #211 from Tyroie/for-wreckedavent

3 Tiny Changes