Merged analyzeBrown branch into master