simgislab Merge pull request #4 from shoorick/patch-1