Merge pull request #7 from jpkeane/master

Rebase Calliope
Merge pull request #9 from jpkeane/calliope

Merge pull request #7 from jpkeane/master