Merge pull request #4 from canadatom/develop

Develop
add make
update JDK 6