Merge pull request #25 from raviosc/developer107

Developer107