commit local1
Merge pull request #1 from garganiel/Oscar

commit local1