Merge pull request #138 from nwinkler/java-plugin

Java plugin