Merge external repository into sampattavanich_2013