Some changes
Merging issue-6 into master and resolved conflicts