lan first forked file
Merge pull request #2 from gwm-lannguyen/master

merging changes from v2