Merge pull request #96 from rosslagerwall/enotempty