added changes from master fekyll: