Fix #127 (whitespaces in value) and fix #126