Possibly a fix for conflict resolution mess-up that reverted this file
Merge pull request #651 from isuftin/master

Possibly a fix for conflict resolution mess-up that reverted this file