Commit #002

* changed code style
! not tested yet