various changes
Merge pull request #1 from anefzaoui/master

various changes