Fix default value extraction
Catch TokenError.
Merge pull request #54 from r-e-d/master

Merge