Updated to work with JRE 1.6 and 1.7
Updated to work with JRE 1.6 and 1.7