Merge Java 7 example into master

I had a change from a year ago off on the java-7 branch.  Time to get it merged into master.