Merged in fix/merit_vs_cost (pull request #195)

merit vs cost

Approved-by: Ruben Grandia <[email protected]>