Reimplemented AnotationFormatter tool
Merge origin/master