Refactorbis

Manual merge of #248