fix bug #1
Merge branch 'fixbug-1' into release-0815