prettify implemented
Merge branch 'feature-code' into develop
0.0.16
Merge branch 'release-0.0.16' into develop