Fixed option value parsing problem caused by fix #63. Formatting fixes.