Code for resolving issue #1 and #44

Code for resolving issue #1 and #44