Added support for nil & boolean (closes #2 and closes #3)