* Fixed space being not part of selection;
    * Added new line when needed; (+1 squashed commits)

Squashed commits:

[3a7b487]     * Fixed space being not part of selection;
    * Added new line when needed;