Merge pull request #1 from arcanous/master

update to latest