More accurate parsing
Merge pull request #1 from RubyBB/master

More accurate parsing