First Cut from base
Fixed Conflicts
Merge pull request #1 from vangasasidhar/master

Added new things.