Resolves issue #43 and updates.

Also updates the Gemfile.lock to reflect the current gems in the
Gemfile.
Merge pull request #45 from jameskyle/hotfix/issue-43

Resolves issue #43 and updates.