Git is awesome :-)

This pull request is made from multiple squashed commits. If you don't believe - check my fork :-). Cheers!