cleaned up MergeTable and added tests
Merge pull request #54 from timbokopter/feature/cleanup_MergeTable

cleaned up MergeTable and added tests