Merge branch 'trunk'
Merge pull request #1 from Sgenmi/master

Merge branch 'trunk'