check out related changes
Merge pull request #196 from raviosc/developer107

check out related changes