refactoring + fixes to integrate with Django
update version
Update to version v0.12.1
Merge branch 'release/v0.12.1' into develop