merge both repos

working merge with bbl-fork of 140911