Fixed Issue 3

Please pull!