Merge pull request #13 from jpkeane/calliope

Calliope
Merge pull request #14 from jpkeane/staging

Merge pull request #13 from jpkeane/calliope