Merge pull request #1 from WhatsARanjit/qa

Ticket: 1235
Merge pull request #2 from WhatsARanjit/qa

Updated template to v2.0
Merge pull request #3 from WhatsARanjit/qa

Backed up to v0.1
Ticket #1234