test cases
gcf and test cases
Merge origin/master