merge test
Merge pull request #5 from AdyCastEX/ady_v1.3

merge test