Revert "t"

This reverts commit 7b518e124cdc31852df3caa8cd5864f35206cebd.
Revert "added review comments for the fix for bug USERGRID-22, ICLA - Malaka Mahanama"

This reverts commit e186568e0f32a78fee53b2006691337def1729e3.
Revert "Revert "added review comments for the fix for bug USERGRID-22, ICLA - Malaka Mahanama""

This reverts commit e0dfaad6576ea86a0463f434e8317b07482c053d.
Merge pull request #105 from malakaM/22

Fix for Usergrid-22