Merge pull request #2 from gwm-lannguyen/master

merging changes from v2
adding index for v2 release
Merge pull request #4 from globalwidemedia/v2

adding index for v2 release
trying to create a conflict
merge file from master