Resolving conflict + added todo
Merge branch 'develop' of https://github.com/Westpic/Solap4py into develop