Took @gdub22 and applied it.

Merged @gdub22 Pull request.