Merge pull request #1 from NicolasDP/master

Minor fixes: