Fix #6 - dropping linter
Fix #8, Fix #7, Fix #5