[issue #3] Adding a new line! :-)
[generic] resolving merge conflicts with master.