commits for issue 13; windows support still broken