Number parsing issue fixed
Logging added