Oibit2

This is a merge of @pcwalton's oibit2 branch