pull-request-233

@shinnlok does this do the same thing?