Merge pull request #25 from Frique/master

Increased element caching & added option to keep empty option tag.