Style fix
Merge pull request #1 from MishFdM/master

Sync
Merge pull request #37 from realtebo/master

Style fix