bugfixes, we can spell friends now
Merge pull request #30 from gopher-snakes-2013/bugfix-sessions

bugfixes, we can spell friends now
fixed merge conflicts with latest version of master