content related changes
Merge pull request #89 from raviosc/developer107

content related changes