Would you mind removing this line and line 50?  That way you can resolve #1 #2 and add a new feature with this pull request :smiley: