same here, can you drop all the changes in this file... I've addressed this bug in another pull request that will be merged shortly #173