Misc changes.
Merge pull request #32 from mounirlamouri/various

Misc changes.