Finished adding separators

Resolves #24.