Merge pull request #1 from dustoki-philwei/master

Commit from dustoki_philwei
changing again
Merge pull request #2 from philweigeomatics/master

from philweigeoamtics