merge #2

8/12/2014 merge