Merge pull request #403 from tobiasd/20170209-pledgie