Fixed boolean and added support for numbers.
Fixed bug with boolean.