Manual Merge

This is a manual merge of #26

Closes #26