final merged copy
Merge pull request #10 from geniewang/GBranch

final merged copy