add conditions to table
Merge pull request #3 from karmeljuk/dev-1

add conditions to table