#12, backport geot-4497
Merge pull request #14 from simboss/#12

#12, backport geot-4497