Pr/2

Some minor changes to Pull request #2 .
Thank you for your contribution!
(... and sorry for the slow reaction)