Merge pull request #13 from uiri/staging

Staging
Sorry about accidentallying your changes medi...