Merge pull request #5 from gr-wang/master

merge source to work from master
return to older source test.
Merge pull request #6 from gr-wang/work

Work