Merge pull request #273 from matfed/master

better heur