Switched to more compatible GetHomeDirectory for Windows
Merge branch 'dev'