Merge pull request #64 from waalzer/master

updated tests
updated tests