enhacements suggestions
Merge pull request #1 from massyl/master

enhacements suggestions