Merge pull request #12 from R1V3R5/master

Many changes to many files
change/fix 3 files
Merge pull request #13 from chiswilson/master

change/fix 3 files
fixed tables controller and others