Iss4

Fix for issue 4.