home update at 2014.6.24
merge solution