Should fix nornagon/atom#3
Merge dommmel's fix for #3