Merge pull request #7 from jpkeane/master

Rebase Calliope