Merged middleman branch into master