Formated code according to new code style
Release v.1.3.1