Merge branch 'hotfix/saverecords' into develop
Introduce a little bit smarter number of breaks
Merge branch 'release/v0.1.1'