Cosmetic
Merge pull request #4 from rbovard/cosmetic

Cosmetic
Merge pull request #1 from geomapfish/master

Update from original