Pr/87

Extension of #87 
//cc @kappa 
Yup, looks the same in monospace.