Tuple2 and modified ant script
Merge remote-tracking branch 'origin/master'