work in progress
Merge branch 'dev' of https://github.com/ahellander/pyurdme into dev