make it better
Merge https://github.com/webofbits/Test