Pull merge of emergeo and Nick's latest