Made changes
Merging issue-4 into master and resolved conflicts