Merge pull request #1 from rajasimon/master

Major design