Merge pull request #1 from ow2-chameleon/master

Merge to date
Fix #34
Merge branch 'master' of https://github.com/ozangunalp/core
Merge pull request #35 from ozangunalp/master

Fix #34