Merge pull request #3 from danholevoet/master

Updates to use Java 7