Merge pull request #1 from stjohnjohnson/master

Merge
fixed bug when feature doesn't have any elements
Merge pull request #6 from NinjaTux/master

Feature without any elements bug