Merge pull request #96 from franzose/master

updating master to 3.x
added proper table prefix support and made some variables more verbose
Merge pull request #97 from franzose/3.x

added proper table prefix support and made some variables more verbose