Altered Ian's additons to make Spec compile
Merge branch 'master' of github.com:Donnervoegel/java