Enhancement 345

Sorry I'm just testing the pull requests :$