Fixed #7, closes #7