feature ready for the pull request

that's AMAZING!