Fix step 1 & 2 and create template for step 3 & 4
Merge pull request #17 from rajthilakmca/master

Fix step 1 & 2 and create template for step 3 & 4