fixing build
Merge branch 'java7' into 0.1.0-java7