#22 - conditional table checking
Merge remote-tracking branch 'origin/master'