Merged from profile78. Improved value parser. Pushed version 2.1.1.