changes done by allan
Merge pull request #106 from raviosc/developer20

changes done by allan