close #26
Merge branch 'trunk'