shared logic combined
Merge branch 'master' of github.com:mattferrin/element-query