Merge pull request #2 from lqnux/local

merge local into master