Fixed issue DATAREST-82
Merge pull request #94 from Intelliware/master

Fixed issue DATAREST-82