Fixed Invalid Number errors.
Merge pull request #25 from xmillsa/master

Bug Fixes in /tw