Merge pull request #66 from Northcode/dev

Dev
Session stuff
settings stuff
Merge pull request #68 from Northcode/dev-Jens

Dev jens