Merge pull request #770 from poolifier/elu-strategy