Bitfield merge with master

I think we should merge this part into master, because this branch has exceeded it's scope :)