updated for Eclipse Kepler and Java 7