ROASTER-7: JDK 1.6 compatibility changes
Merge pull request #13 from mrietveld/master-java6

JDK 1.6 compatibility changes