add issue54_1
add issue54_2
add issue54_3
Merge remote-tracking branch 'origin/master'