Issue/30

Fix for issue #30.