Session Support (Fixes #3)

Additionally makes the syntax more consistent and enforces the line
length more.