Closes #19
Merge pull request #20 from Chicago/dev

Closes #19