merge gotham branch into master