Merge pull request #1 from pcercuei/for_upstream