Optimized a little
Merge pull request #52 from charnad/skip-fields

Optimized a little