Merge pull request #24 from ellerh/implement-environment-query