Bug fix. DRY up methods
Merge pull request #17 from henryh28/session_convert

Bug fix. DRY up methods