Compatibility with Java 5
Merge pull request #352 from simonbrandhof/master

Compatibility with Java 5