Processed Andyhausmanns' PR (closes PR #47)