work towards fixing newly introduced break-* bug
release candidate of the break-* fix
Merge pull request #12 from FremyCompany/master

Merge from master