This will resolve #7 and close #7 at the same time.