Adding last minute changes
Merge pull request #3 from dirkaholic/feature/community-gopher-20140314

Adding last minute changes