Review Comments : Proper use of optparse
Minor fix
Merge branch 'Phase2_Mindteck' into beta