Merge pull request #13 from mgarin/master

Update JDK6 branch