Merging resolved conflicts from PR#3

Merging resolved conflicts from PR#3