Proper support for spaces in strings

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>