Issue #183 coventions fixed and handling more failure demos