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

check out related changes