Make it work on both Linux/Mac
https://www.pivotaltracker.com/story/show/80923768
[#80923768]