merge test from XShan
Merge pull request #7 from CS673-Project/XSahn

merge test from XShan