This closes #316. Merge branch 'pr/316' into two-dot-o-dev
This closes #316. Merge branch 'pr/316' into two-dot-o-dev

mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid,mdunker/usergrid