Merge pull request #361 from HeisSpiter/master

Check more efficiently for emptiness