tests 2 requests
Merge branch 'master' into tests2
Merge pull request #8 from henrytwang/tests2

Tests2