Obvious TODO is obvious.
Downgrade to JDK5
Merge pull request #40 from ai14/master

Pull request from master