Fixed #12 PR