incorporated review comments
Merge branch 'trunk' of git@github.com:impetus-opensource/Kundera.git into trunk