Merge pull request #22 from wagnert/master

Remove internal reference to session
Minor refactoring for new session handling
Merge branch 'techdivision'