Error fix
Merge branch 'refactoring' of /clients1/alireza/Projects/repos/../Gmml/Dev/gmml-refactoring into refactoring