Merge pull request #32 from slwaller/master

joint table functionality