Merge pull request #1 from geomajas/master

update