Merge pull request #21 from YanshuoH/view-yp

Merge branch fixing commit lags