Merge pull request #2 from adamcandy/master

Merge pull request #36 from gismeshing/master
Merge pull request #37 from gismeshing/master

Merge pull request #2 from adamcandy/master