[features/6 revised]
Merge pull request #8 from ninabreznik/features/6

[Closes #6]