merge the latest codebre-io to manbear's fork

To be up-to-date with the lastest develop of codebrew-io