merged code
merged code
Merge pull request #1 from openearth/initial

Initial