final changes
Merge pull request #77 from raviosc/developer104

final changes