Merge pull request #96 from blind-squirrel/Sharon

Fixed config.
work-around for local-name
change to local environment
fixing local environment