Halfbaked crapness-- Err, goodness
Merge pull request #2 from Sunstrike/scala

Halfbaked crapness-- Err, goodness
Merge remote-tracking branch 'origin/master' into Scala