Fix #38. Was a highlight issue
Close #21
Fix #25 - To be tested