Merge pull request #43 from cybermaster/master

more tests.