Completed NilClass contribution.
Merge pull request #99 from mattSpell/master

Completed NilClass contribution.