Thanks @aneek for the review. Patch changed as per #63.