Fix for issue #28
Should solve issue #27
Version updated