Made code refactoring
Merge branch '1.0'