Issues/8

Hi. This is the fix for Issue 8