140630 2nd commit