test on config
Merge branch 'dev' into fix/migrations_and_configuration
updated migration
Merge branch 'rel/0.2.1' into fix/migrations_and_configuration
small changes
fix
Merge branch 'fix/migrations_and_configuration' into rel/0.2.1