Fixed #10

Issue 10 is now fixed.