Updated tables.py: correcting tables
Refactoring code
Merge pull request #24 from Relrin/dev

Merge #23: Refactoring code