code cleaning
5.4 / 5.5
work for 5.4 / 5.5
Merge branch 'release/0.1.2'