Merge pull request #18 from uiri/staging

Staging