Small change on the "main" script
Merge branch 'issue22'