Change in line #218
Fix for ISSUE #17
Resolved Conflicts