Merge develop, migration fix, pep8