Merge pull request #9 from kmkaplan/master

Fix bug introduced in commit b24501a67e27661277cde7dedcf6378cc219a8e5.