Solves merge conflicts

This solves the merge conflicts in the development branch --> #95
Merge pull request #96 from Liblor/development

Solves merge conflicts in python files