#98 Fix
Merge pull request #100 from vguerci/optimization-elementname-fix

#98 Fix
minor performance tweaks