merge test
Merge pull request #2 from adam000034/master

merge test