FIX: Fix naming for numpy/pandas/windows
Merge pull request #26 from Eric89GXL/win-fixes

FIX: Fix naming for numpy/pandas/windows