Fixed merge errors. Develop and master should match exactly.