Fixes based off of pull request #14.