Merge pull request #1 from arcanous/master

update to latest
Merge pull request #1 from shaitanCoplin/master

Merge pull request #1 from arcanous/master