Tonio changes
Merge pull request #1 from maximho/tonio_version_1

Tonio changes, please take a look