Solved conflicts
Merge branch 'master' of github_skoenen:skoenen/pyprol