Reverting to be Java 6 compatible
Merge pull request #149 from smarthi/master

Reverting to be Java 6 compatible