Minor changes
Merge pull request #23 from mdeloupy/minor-fixes

Minor changes