work in progess
Merge branch 'master' of https://github.com/wikiviz/wikiviz.git