Added code to fix #1
Merge branch 'master' into issue_1 to resolve conflicts.
Merge branch 'issue_1'