Merge pull request #10 from typekpb/master

openjdk7 support to be tested by travis
Merge remote-tracking branch 'upstream/master'