close #25
Merge branch 'trunk'