Merge pull request #1 from j0h/trunk

Trunk