Push on 24th august 2014: have corrected algorithm