Merge pull request #11 from hackeryoung/master

File Hierarchy Modification
Amandation on test cases
Merge pull request #12 from JasonYJWANG/master

Amandation on test cases