Merge pull request #20 from dawgtrades/master

merge
minor changes. session manager not done yet
Merge pull request #61 from jrec15/master

minor changes