Tightened the conditions for Lees-Edwards
Merge branch 'espresso'