Changed empty coords handling
Merge origin/master