neo-alex

@wochinge Fine thanks, sorry for the delay - I will try to do required changes today and will let you know in case I need some help :)

Alright, I tried to answer all your comments above with associated micro-commits. Let me know what you think when you get a chance to review again @wochinge Cheers