Merge pull request #14 from niode/nathan

Formatting and whatevs
test.java
Merge pull request #15 from niode/nathan

Fixed some whatevers
IT'S ALIVE!