Merge pull request #32 from vadmium/tuples