Shane Request

Oz,

Let me know if you have any issues merging my code.

-Shane