Better country detection. Fix #108