Some small changes to make the project working
Merge pull request #1 from hbakhshi/master

Some small changes to make the project working