Dragos Manolescu

Thanks for the edits. There are some conflicts I can't resolve while oh my phone, will tackle them soon.