Merge iss6

Fix for issue #6.