Initial commit - Working properly on Windows 7 and 8.1