3-12-2014 merge done