updated simple data retrieval
Merge branch 'master' of github.com:ashdavies/kiwi