Now works with both Windows and Mac (sort of related to #27)