Fixes #43... or so I hope
Merge pull request #46 from KoxAlen/Servinow

Fixes #43... or so I hope