use new data source
Merge branch 'master' of https://github.com/bdon/popos