Updated for Hadoop 2
Updated for Hadoop 2.0