Merge pull request #1 from koolguru/master

Merged Test Branch