changes required to make this work using Java 8 on windows 8
Merge branch 'kevinwu1-master'