merge pull request #29

resolves #29

resolved conflicts:
- deleted handlers and test scenarios due to Entity API changes - features have to be reimplemented
- fixed UTF-8 encoding