modified to array query method
Merge branch 'master' of github.com:ashdavies/kiwi