Remove trailing spaces and config options update
Development version of this module