Merge pull request #2 from APAC-Local/rfang_branch

merge code