Merge pull request #1 from JekaNS/master

New version merge with Eugeniy
style fix for 3gmaster
Merge pull request #1 from berdof/master

Merge back