merge branch req
pull from upstream
added some more tests
Merge pull request #531 from maxking/dev

More tests