Merge pull request #13 from jpkeane/calliope

Calliope