Merge pull request #1 from kakaly/master

Final Integration
Merge pull request #1 from caharsha/master

Merge pull request #1 from kakaly/master