Incorporated Davide Cervone's improvements and bug fixes. This mostly involved removing unwanted spaces, etc. Arnie
Changed paths: