Merge pull request #32 from Aintaer/master

Testing improvements