Issue/26

Fix for issue #26