Tests for Issue #12
Merge pull request #14 from jimmed/issue-14

Tests for Issue #12