Merge pull request #1 from KhaosT/master

Update from original