Merge pull request #1 from photonstorm/master

update from original