Making some parts a bit nicer
Merge pull request #19 from SanderSpies/sspi-work-in-progress

Making some parts a bit nicer