Merge pull request #54 from bafipawi/master

Converting TableViewController