Fixes issue #161
More authors (fixes #161), empty check added.
Merge pull request #218 from peskk3am/issue161

Fixes issue #161