Did some mods
Merge pull request #3 from sandamal/sandamal

Did some mods