Pull Request for the final touches

I have made the final touches and believe this to be the final version.