added tests
Merge remote-tracking branch 'upstream/master'
updated tests
updated test
Merge pull request #49 from waalzer/master

added tests