add jellybean branch support and formatting