Merge pull request #6 from evanwest/master

Addressed issues 1, 2, 3, 4