close #32
Merge branch 'trunk'