Merge pull request #8 from LO23/master

Update
Merge pull request #456 from unkedeuxke/master

Merge pull request #8 from LO23/master