Perhaps that could be left until we add Linux and Mac compatibility.  I'll merge now.