Cleaned up TupleDesc methods
Merge branch 'dev'