Merge pull request #486 from Tailszefox/local