Pull Request With A Few Minor Changes

Pull Request With A Few Minor Changes

Last commit was a bit huge but...