latest changes
Merge pull request #2 from gaby64/master

latest changes