Some improvements
Merge pull request #2 from Ph3nol/master

Some improvements