Fix for issue #1

The method now returns null instead of empty string. This was an issue described in #1