Merge pull request #43 from felixheld/programmer-error-fix