Merge pull request #6 from Laranesia/4.1

4.1
Merge pull request #7 from Laranesia/master

Merge pull request #6 from Laranesia/4.1