Manually merging pull request #12 from chipaudette/master