fix bug#2
Merge branch 'dev5'