Add UI_NULL_VALUE_TO_BE_CHANGED_LATER
Bump version to 0.0.36