Can finally delete hosts!
Merge branch 'development'