Addressing Jira Usergrid-113 

Link: https://issues.apache.org/jira/browse/USERGRID-113