Merge pull request #1 from landroni/master

update to upstream trunk