final cleaning
Merge pull request #148 from sarakha63/development

final cleaning