fix Conditinal test
generics
Merge pull request #2 from sashee/master

Fixed conditional update