modified with last changes
Merge pull request #3 from ikwattro/2.0

modified with last changes