Merge pull request #10 from Evgenus/master

better tests semantic