Usergrid 1243

Also github issue 67 - https://github.com/apigee/usergrid-stack/issues/67