[Closes #6]
[Features #7]
[features #7]
[features/7 revised]
[features/7 revised]
[features/2 revised]
Merge pull request #9 from ninabreznik/features/7

Features/7