bug#issue#51 bug#issue#52 feature#issue#53
fix MR merge bug