Referring to #264

Not sure if this is pull request is mergeable..