Fixing empty return bug (Fixes #27)

Fixes #27