Updates to support build under JDK7
Updated version numbers in source.