Switched to JDK 1.7
Merge origin/master