Issue 1: Add acceptance tests
Merge pull request #4 from myoung34/dev

Dev