Changes to file names, syntax errors
Merge pull request #4 from durangol/develop

Changes to file names, syntax errors