Close #1255.
Merge pull request #1257 from ihavenoface/pull-request

Close #1255.